merge trunk

diff --cc lisp/ChangeLog
index a68177e27a8ea9484e96353aa0254632267f8cc3,c4bd5f0a5866e888b66b6c4621fdbd4f9253192e..5462a350c6d65a8a0815be6a1f713379aee7992e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,15 +1,21 @@@
 +2012-05-03  Kenichi Handa  <handa@m17n.org>
 +
 +      * mail/rmailmm.el (rmail-show-mime): Catch an error caused by text
 +      decoding, and show a warning message without signalling an error
 +      (Bug#11282).
 +
+ 2012-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/bytecomp.el
+       (byte-compile-file-form-custom-declare-variable): Compile all elements,
+       since cconv.el might have introduced :fun-body, internal-make-closure,
+       and friends for bytecomp to handle (bug#11391).
+       * custom.el (defcustom): Avoid ((λ ..) ..).
+ 
+ 2012-05-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * subr.el (read-passwd): Better clean after ourselves (bug#11392).
+ 
  2012-05-02  Juanma Barranquero  <lekktu@gmail.com>
  
        * notifications.el (dbus-debug):